From: Julien Grall <julien.grall@citrix.com>
Date: Thu, 21 May 2015 14:31:21 +0000 (+0100)
Subject: xen: Move preinit_xen_time in ARM headers
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~3177
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=52622e27206d48b7ca85ca909724734f3db4f15e;p=xen.git

xen: Move preinit_xen_time in ARM headers

This function is ARM specific. It's has been added by mistake in the
common code.

Signed-off-by: Julien Grall <julien.grall@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/xen/include/asm-arm/time.h b/xen/include/asm-arm/time.h
index d544b5b710..039039a416 100644
--- a/xen/include/asm-arm/time.h
+++ b/xen/include/asm-arm/time.h
@@ -31,6 +31,8 @@ extern void __cpuinit init_timer_interrupt(void);
 /* Counter value at boot time */
 extern uint64_t boot_count;
 
+void preinit_xen_time(void);
+
 #endif /* __ARM_TIME_H__ */
 /*
  * Local variables:
diff --git a/xen/include/xen/time.h b/xen/include/xen/time.h
index bb19511bff..da4e8d7850 100644
--- a/xen/include/xen/time.h
+++ b/xen/include/xen/time.h
@@ -12,7 +12,6 @@
 #include <public/xen.h>
 
 extern int init_xen_time(void);
-void preinit_xen_time(void);
 extern void cstate_restore_tsc(void);
 
 extern unsigned long cpu_khz;